Improve nasl expansion macro