Fix to allow mapping of constants into mandatory intrinsics