I split the changes to avoid growing it too much. I will create another MR with more FUNCTION_OVERRIDES cleanup (I intend to use dedicated array for each property, I think it'd make future modifications less prone to conflicts) and the unwrapping fixes.