More initial work on C normalization