Some fine graining of mac-tools