Rewrite singletones