More code simplification.