Removed most singleton patterns. Resolves #181