further simplifications
bench 4164062