apply-canvas: Reorganise wanted format detection according to Daniel_S.