Tweaks and workarounds for my faux enums stuff.

Signed-off-by: sigilworks <tj@sigilworks.com>