Unify parsing code for control.c