Increase reliance on loopy auto-typing