allowing multiple variants on a theme - #401