Minor cleanups for deleted functions to ensure they're a bit more robustly "deleted".