Cleanup. Move some node patterns into VectorProcInstrFormats.  Change case on some variables.