A little cleanup for nonisolated stuff