Merge new regular expressions.

The new regular expressions only identify the start of a procedure, type, or class. We also fill out the structure of the rest of the parse loop.