Argument cleanup and documentation tweak.