match-cmp can now handle atoms; hacky