Fix variable rename
Fix active_enum support. These are class methods.
Merge remote-tracking branch 'remotes/origin/lowjoel-fix-reflections'
Merge remote-tracking branch 'remotes/origin/lowjoel-active_enum-compat'