Tidy a few more dataspaces