Simplify some of the once-based code.

Change-Id: I3eb2d7924e49b8be296c7386e66f34b0e35b495a
Reviewed-on: https://code-review.googlesource.com/4274
Reviewed-by: Paul Wankadia <junyer@google.com>
2 files changed