Nilsafe improvements.