[h1ccup]

Well done. I had to deal with some similar issues with my own project, and they weren't legacy code either. This should push me to go through some of my code again.