Remove pre/step/post from entity, move poststep stuff into update
Add safe and pure annotations to Bounds.contains