[PATCH] Refactor some duplicated code in mpparse.c