MULE-7277 Various MEL performance improvements and cleanup