Normalize `decl.before` and `decl.between`

This will fix #27. But test case needed.
Merge pull request #28 from hail2u/issue27

Normalize `decl.before` and `decl.between`