Order use statements alphabetically

Squashed commits from PS #394