Moved html-expand into hiccup namespace.