Fix lingering bugs in decls
Merge branch 'master' of https://github.com/wyvernlang/wyvern