Cleanup: adjusted IFS better.