Clean up for better CLI compatibility

[StevenClontz]

Here's the changes I made to get better builds with the CLI. (Try to pretext build -g this version...)