Add ppr for the MKPAP case, and rearrange the other cases to match the datatype