Revert "..."

This reverts commit fc21370eefec8210fd2902e3cbbf4ea13210f44c.
Initial fix for issue #188, handle simple case.
Modified test case to test more properties of forward-references.