Use keyword as result-type
Fix tests for :variants change