Replace CDC interface numbers with enums.

Also did a couple of whitespace fixes.