Is this making the code more robust against working in LMS vs. Workbench? If so, it may be worth making a separate 'shame' file with these work arounds?