dfxtra compilations-cuckold cleanups