Fix type hierarchy of Constant