Refactor p_* cvar setting