More work on parsing media queries.