Fix number agreement niggles.
Merge pull request #38 from SethMilliken/patch-3

Fix number agreement niggles.