Updated to match ArydAPI. (Also some toying.)