Clean up all uses of get(..., None)