refs #171: annotation layer hit test cleanups