These need to be moved to Definitions, but I'll do that when rebasing.