more cleanup
migrated EnumAsIdentifier check & beefed up test cases