My feeling is that special-casing this rather than returning supplying a single-element list will lead to more code proliferation, what do you think?