Helper API cleanup. Allows multiple helpers to function,

because they'll always go in the same order, and this lets
us not have to write headers to keep them paired.