More variable-size cleanup.