Removes closures in TypedPipe, adds Empty

closes #532