I'll look into it more, and maybe find/add/modify a test or two.