Minor tweaks, before the big rewrite. Make sure we don't crash if you make a receiver typo ;)