Merge "Fix braino in enum use."