Compile fixes
Fix bug where expansion locations would crash

Was trying to modify immutable list, also didn't do what it meant to do
anyway, now does.