More work on the C port.