Move lines around a bit
Card#expansion should not be null