Tweaked references to enum values