Have "waves" properly singularize to "wave"