Explicit constant type indication added to grammar, type system refined