There wasn't really a reason to have them as a constant, and we were
getting "already defined" warnings which are always annoying.