(cleanup) Use builtin MacItems instead of homegrown version.