Add more constant handling and update expr.h for override keyword