cleaner variant handling