Pattern synonyms have no implicit Ids
Move comments around and re-factor psTheta

Cosmetic changes only in here.  The only significant
change is splitting psTheta into two fields
Comments and tracing only