Simplify and fix extraneous tag...