Issue #3134300 by quietone, alexpott, benjifisher: Simplify ReviewForm::buildForm() and the resulting markup