Shorthand Echoes Fix

Bruce had some stupid shorthand echo throughout the site, they have been
replaced with the proper version thereof.