More minor code style / performance optimizations.