Minor performance cleanup.