more Array<>/Array patching template cleanups