Refactor annotations to be succinct; update test cases (issue #16)