Alphabetization fixes for #46 merge