urgh

re-add some guards, firefox takes too long to kick in for optimizations
in these functions