Small logic simplifications