Resolved review comments r=cwolff