Refactor, extract expanded_masculine_noun()

Prepare for expanding feminine and neuter nouns by splitting out
masculine logic.