Fair point... I'll move it accordingly. 

Side note: given the current discussion on removing entry visited notifications from the JSR, I might not even need this flag in the end. I'll keep an eye on the discussion.