* A little cleanup for better compatibility with LoosefulTools