compiler: Update Map guard and match tests