Minor build fixes by speakman

I had some trouble building libmaple and did a few justifications which shouldn't affect any other builds.