Merge "subcount() no longer works for strings." into pi-dev