Proceed with tiny refactors and speedups.