Minor efficiency impromevents.