Patch from JonY to remove more CPP hackery.