Refactor plist parsing a bit to make it easier for regression testing