Completely agree, I thought the same while translating... fixed both issues with your suggestions