Merge "Cleanup ReadArgs & ReadValueArgs usage"