A few readability fixes and lib/*.mk demotion since conf.d/*.mk
is now an established place for RM-written image configuration.