imake cleanup: Break up multiple vars into invidual lines to ease further work on patches / pull requests.
