Ensures that all units are plural, closes #1003