Cleanup Postponed References

Replace them with the single method from the GMK reader.