Added array and typedef support.