Fix C# optional field reflection when there are regular fields too

Previous tests didn't spot this as each message was either "all
optional" or "all non-optional", at which point there isn't a problem.