Some intrinsic cleanups