Not related to your patch, but looks like we over-indented in ```convertMapStatuses``` in L346, and GitHub won't let me comment down there.