Further cleanup of stray variables to printf()s