I'm happy to do it sooner rather than later (today), as it'll only make things easier but I think it should be on a separate branch/PR.