various tweaks to let haddock work
Merge pull request #1 from ranjitjhala/master

minor tweaks to appease haddock.