Various minor tweaks, and Jumbo code cleanup in loader.c (overlong lines).