Further code simplification.