Make some definitions less pointless