Replace tabs with spaces and use more logical grouping

Already v0.1.0 since it's been used for ages as part of BMO (my other
project, not released yet.)