Reverted to A/An...

This may have re-introduced errors, which I'm on the lookout for now.
Still, I think things are in better shape than what they were before.