JFP-ification of 2.6.