Another attempt to get these #defines right