Clean up of code around NullPipe, SingleRow et al