Finished fixing issues with ordering for sites and angles

Also included a number of other reorganizations to make
translation more robust.