Upgrade a couple remaining modules to the newer Jackson.