Cleanup of code post-Inplane Functionality Merge

A number of code-cleanup issues that I had noted down that I wanted to leave as part of the post-Inplane Functionality new load process merge. This also includes a bug fix as found by Ariel.