Completely moved from Q to variable base-type.