Simplify 'singleton'.
Add proper fold'.