Changed to using of symbolic names for delay variables that used to be magic.