Allow calling with_model without a block
Remove now-unnecessary empty block in with_model calls

And add a test around calling with an empty block to ensure it continues
to work.