After this rebase, I don't think these variables need to be exposed anymore either!