World|Sky: Further minor code cleanup