Minor code simplifications.