Minor code-stylistic improvements in control library.