These should use the suggested #defines here.