Two dot oh formatting fixes

Some legacy and initial two-dot-oh code style fixes.