Restrict stateful annotations to endpoints (issue #1)