Make call annotations brief
Fix goto labels

When generating a label, the address was not passed,
resulting in meaningless zero labels.