Fix items that were missed from peer review Remove dead code Add ret capture of return from XVSNPRINTF