Further cleanup, but the behavior of procgen eludes me.

ctl is still not visible.

Signed-off-by: Ronald G. Minnich <rminnich@google.com>