Made a few things more explicit in the markup.