Some tidying of modifiers ready for ID flags, a tests fix
Add new (as yet unused) identify flags, eventually to replace IDENT_*