Refactor and cleanup only.

Bug: angleproject:3353
Change-Id: I2a01ddf71ba44b8f1a1fc2c4ccbac9edc7c80174
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1613893Reviewed-by: Courtney Goeltzenleuchter <courtneygo@google.com>
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>