Some more changes for ::getSize.