Shuffle a couple of definitions around