Improve platform parsing.