more coherency between pas2c and normal build