Remove uses of DEFINE for local definitions