Consolidated the Registry into a single variable.

Review: https://reviews.apache.org/r/18158