Canonical fixes to -passthru and some other fixes to -internal.
See #24.