Tweaking annotations to ensure correct mark-up of code