[#530] Reformat member types