Slight markup refactorage fixing breakage.