gp-130: Normalize all helpers
gp-130: Normalize all helpers, second round.