@andy-armstrong I do think some cleanup around the expected value of "mode" would be good.