Provide contextual markers

Fixes #1239