Also improves the metadata and generally makes the configuration
a bit cleaner.

(cherry picked from commit ac124867)