I think the rewrite is fine.