Some improvements on building nested forms. [ci skip]