Some more minor simplifications