Simplify the last change further