Minor performance enhancements to Nautical.