FLUID-5335: some markup cleanup