Add some more type signatures to try to stop haddock from freaking out.