More work replacing comments with actual code.