move intrinsics and sentinels into modules