Cleanup so that 'items', 'message' keys are now standard API response keys.