Misc refactoring/tidying

These are just minor cleanups.

I'd like to eventually add tests so that our libraries, like data-entry, are properly tested by our build server.