Use -z consistently