More JFP-ification for 3.0 and 3.1.