I did not know about `includeIf`...this allows getting rid of the hacks I used to achieve something similar, great!