[2.0] More fixes to EntityGenerator. Coding standard fixes and improved error reporting on invalid arguments provided.