Changed DSL to use nested blocks
Fixed matching on thunk builders