This breaks current usages, but we are in experimental stage, so things like this are to be expected.