MVEL-237 - Cleaning up ThreadLocals