Further cleanup from using the no_markup tag