A few minor speedups.  Coming soon: Clean code?  Refactoring?