Dominic: remove more unwanted recursion