(This allows correct clipping for these cases when transforms are involved).

This is a partial fix for #177 (the other part relies on changes to layout).