Made warray interface more sane.