Added singular-to-plural pass to go after plural-to-singular pass so that we end up with the correct plural, even if the source plural was wrong. Fixes #7.