Minor tweaks to the ElementRenderer.