Somewhat more consistently map references to C