After this refactoring, I understand that LM_S* macros are useless. Have been they removed from the code? (I haven't review the whole PR, but I fill this comment before I forget it :)