Code cleanup for warray and wtable.