Clean up whitespace.
Mark build-time dependencies.
Fix test.