COMMON: cleanup sysvar handling