Compiling more things. Smarter configuration merging.