Some small improvements to eficiency when using Think