[mediaqueries] Fix the railroad diagram for <media-query>, plus a few small spec bugs.