Get nextsame, callsame etc. tests passing.