Cleanup macros for distinguishing mandatory locks