Update for Anton's latest build system changes.
Update for Anton's latest build system changes.

I've tried to preserve compatibility with his earlier version,
so that I don't have to big-bang update all my projects.

Unfortunately this causes the new version to warn like mad.

cbiffle/etl,cbiffle/etl,cbiffle/etl