Another good thing about this PR is the simplification of the proposed annotation support.