Minor simplification, also drops some useless stuff.
For future client API enhancements.
This is mostly just moving code around.