Push expected constraints all the way down

Use `in-value` and `#:when` instead of the extra `filter`.