Initial fix for issue #351, handle simple case.
Modified test case to test more properties of forward-references.