My concern with adding the code as described is it will make the code harder to read and also what happens if in a future release the issue is fixed ?