Clean up reaching definitions a bit