r9557: Some more updates. Use combined function for parsing a set of