This would be best covered by #730.