Adoping some OS modernisms.