Order use statements alphabetically

Squashed commits from PS #394
@pawzar, could you rebase to remove c1b2869 from history ?