Shrinking with when

Fixes #35