Simplify methods and harden their signature

Also fixed a few doc blocks.