minor optimization from Will Bond in #10.