v0.1.x: speedup optimizations