Remove 'M' variants of lock macros