Close out some easy build-cmd improvements

Mainly targeted at incremental build times.