I ended up using the same approach as @elementarteilchen, gating with an availability check on 18.2. I came back to post it, and @elementarteilchen had already discovered it. Glad to see it wasn't just me.