[TASK] Unify NULL default value handling