[PATCH 0/3] Cleanups based on 'nvram' refactor patch