More doc work. Getting rid of args... wherever we can.