Trying some trivial optimizations.