Thanks for breaking this file up!

There are quite a few indentation problems around; here, above in `val caseInsensitively`. Could you please sweep over the patch to try to iron those out? I'll make time for more less superficial review (up to my knowledge to do so) in a few days.