Moved constants into #def blocks