Argumentative Update

Shuffling around the arguments of callbacks slightly.

First Release Candidate

API should be stable. All should be good. Should. ;)