Fix PR #2

Fix the mess that is #2, following some comments I made there

The autobuild files are big and complex enough that we make sure we don't add unnecessary
hard-to-follow code there.