A bit of a change to how defines are handled