`wp rewrite structure` fails to properly set tag / category rewrite rules (2)

Another attempt at https://github.com/wp-cli/wp-cli/pull/814