issue #3 -- more automatic discovery (I wonder if most tools will need anything in the body...)