Use most of #69 to do #70.