Yes, very good point. I've actually slightly tweaked this now to just refer to them singly where possible, and I've also put `{@code }` blocks around the plurals that remain.