This line... actually this entire file appears to already work with the current code is master.  I don't think you are improving the code at all with these changes.