formatting tweaks and updates to reflect renamed APIs
better diagnostics, and avoid rebuilding files that were already built