Re: [RFC] Reorganise definitions....