This matches existing practice, but makes the setup complete and
consistent with the C code setup.