Split make_key into make_key and prefix_key