Remove last few edge cases still using arrays instead of sexps