Safer map parsing...