@witlessbird I think we agree it's a good idea, it's just not really in scope for this PR - lets submit a redmine issue and refactor later (or before :P)