Minor efficiency improvements.  Still a big one to solve though.