Simpler solution for the previous commit: Don't single-expand the variables..