Fixes Issue 9339 - Uniform for enums.