Code changes to simplify component rendering.