Split up some definitions.