Make the -extonly a bit more self-contained and straightforward