Part-way through fixing list element promotion issues; refactorings.
Fix bug introduced by refactoring.
Minor refactoring (make R# happy).