Further source code output optimizations

Gonna catch 'em all!