Internal Optimizations

This update contains no functional changes, but has a large amount of internal tweaks which should slightly increase efficiency.

No functional changes since last pre-release.