More control.c clean up

Additional pints to clean up through the unification of control/shared.c