#697 Separate properties and headers, making it clear which are properties and which are headers.