I know this is not really part of the PR, but if you still have to change anything, could you please make this immutable? It hurts my eyes.