Revert "Reordered type processing to allow alteration of previously defined types."

This reverts commit 0d3ec4439ff417ba6e14fb41feaddc7e6e7d8152.