Minor simplification of implementation without breaking tests