merge unsets + formatting/comments nits