Start on code simplifications.