Distinguish between `ordinal` and point in file
Reorder annotations to dectect self-references
Merge branch 'feat/self-references'
Bump project version to 0.4.1