Updating person unmap to use #if_helpers