Fixed (and improved) --print until the next time it's broken.