Fixes from enum namespace changes.
80 cols, please.