Code cleanups for param registry