JFP-ify 3.2 and 3.3.