Cleaned the way the system uses nested controllers, which is slightly faster than it was originally.