MacAddrField cleanup

Sorry. I missed a couple things I had wanted to fix.