Another try at a better syntax.

This seems to work really well with your last set of changes.