Cleaned space->controller->var nonsense.  #2494 #2223

Leftovers from D6.  Should have been cleaned when it was ported originally.