Put back some code lost in a merge.
Merge pull request #47 from pjonsson/fix-decls

Put back some code lost in a merge.