Changed to not use deprecated Rank2Types extension.