Convert controls to dict
Replace control objects with plain dicts

The methods on the control class were only used in one place each, so
simplified by relocating them to those places.