Followup to #1945 - use modifications to legal_file helper