Katechka-driven improvement for arguments. Passing filename for proper error reporting.