fixup! Optimizations/restructuring from profiling