Probably, but a more thorough cleanup of this code is out of scope currently. :(