Replaced typed constants with untyped constants