More code simplifications.