Fixes related to arguments guessing.