Correct resetting headers

Unsetting doesn't return the property to its initial state.
Migrate to type based null value defaults