Small fixes for moving to trunk

These are various small workarounds for changes and bugs in trunk.  This is most of the diff, other than the difference between `Private` and `Local`.
I suppose that I can implement the alternative work-around, since the `Goal` work around is rather confusing.