Expanding use of strict comparison mode and parameterization