[PATCH 3/3] All size specifications should be Size instances (#1077163)