Separate some more definitions and declarations. #183

Closed drwells closed 1 year ago