Gender change: Scotland moves closer to simplifying process