completion: micro-optimizations to improve startup time