Bit of work towards #485