Yeah, it does create code-bloat. I'll think about how to slim it down and/or move it to an external file.