Reordered call code to reduce likelihood that an non-threadsafe change
would be introduced.