Fixup some leftovers from static_data -> static-data conversion