Some more adjustments for a stricter variable size definition.
Changeset view not shown, since the number of files (32) exceeds 20