add Option methods for swap_unwrap and map_consume