New Zealand moves closer to passing 'self-identification' law