Simplified various control structures.