Variable renames after refactor; try to fix problems in spaceAvailableInLane (to no avail)