Calculating trends from GRACE in the presence of large changes in continental ice storage and ocean mass