Minor tune-up in aes code

un-duplicate a check, and remove useless default case, mainly so that these
lines don't appear as uncovered