Further integral constant usage changes