Minor efficiency changes.