A bit of cleanup on teodozjan++'s workaround.