Clean up JSON module and fix Task errata.