Miscellaneous Optimizations and Code Cleanup

This pull requests bundles a few very small and local optimizations and code cleanups I made. Does not include syntactic cleanup like formatting.