Patches for check_load arg parsing and cleanup [sf#1209978] [#475]