Options to remove some unnecessary query block wrappers

I think this ties in nicely with this feature request:

2 Likes