Made necessary changes per the recent changes to toric-grid-world, which is now immutable.