More unique

Supersedes #72.