More minor simplifications