Switch to new case-insensitive unsafeMk function.