Move the CPP magic somewhere more obvious.