Fix table handling in command-line util.