[cr4nberry]

This just sounds like you're prematurely optimizing for additional security screens getting added.

Maybe that's not on the table atm? Still odd that they took so long to change a couple method signatures and write a couple test cases

[avianlyric]

They already have multiple security screens, and a demonstrated critical bug with security screen confusion. Not sure how this is premature optimisation.

[cr4nberry]

because if the number of screens is small and there are few tiers (only 2), passing an identifier around could be overkill

sounds to me like it's an optimization for introducing more tiers than what there are