Small code simplifications.