CWI-1496: Fix handling of default dimensions.