More Keysets

This commit includes a first pass at keysets for Apex, as well as some
cleanup work for the 1.1.25 release.