Fix bug with singleton remove method, add tests for singleton undef and remove, and go back to using our derived Is.