Compose: Fixed a couple remaining scope issues involved with do/while loops