More mcl_end refactoring