Gotcha, my bad :) I'm guessing that's a common pattern already and it's too late to change everywhere?