Implement the F to C (#9) patchset 3