Use a single map for both variables and percent forms Signed-off-by: Jeremie Dimino <jeremie@dimino.org>