Simplify some code now that we've removed the more optimal (but slower) version