slight simplification, no functional change