Simplifications regarding #7