Tidy up: removing unnecessary cruft.
Make warning longer.