Use NULL for undefined
Update deps