Mostly cosmetic, but also moved some identifers from expression to work