Story 44013941: cleanup to avoid insane nesting with withclass/withattr mustache helpers