LPS-49294 Manually refactor to prevent compiler errors after SF
LPS-49294 Use Reflection such that field can be made final without error
LPS-49294 Refactor two files to allow for source formatter adding final to fields.