Seems my markup-foo could use improvement...