factor in a couple rules
factor in some rules; fix problem in CreatedName:  <> are required around type arguments
simple grammar:  get rid of no-short-if nonsense