Avoid prematurely objectifying things.

This reverts commit 61fe5af75f05119a684061552d602d14054f6ec6.

Conflicts:
	sw/control.py