Bringing my earlier Beta changes back to master

Everybody should pull this one again now, so that you're using latest-and-greatest.