Allow calling with_model without a block

Because there’s no reason it should require one. Also remove all the now-superfluous empty blocks in tests.