Some slight code simplification.