I have heard no objections to the simple solution from the dev list, so applying my simple approach PR.