Minor tweeks to cut down on code size.