Tidying a few type inferences
Merge pull request #122 from JonCanning/master

Tidying a few type inferences