r21492: Finish work on nested type support in EJS.