don't hide syntax context, pass it around!

Now it's everywhere! A bit unsightly...