Commented out raw compiler macro (haven't decided how it should be...)