Killed some remnants of function-relative addressing