Use InclusionTag to simplify… everything

Thanks for the push, @yakky