Code cleanup for AddCallProtocolInstructions

* Removed some dead code.
* Added some FIXMEs.
* Added assertions to catch bugs.