Cleaned up the Registrar.

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