Switch the last few places to use defined.