Nicer conversion using new features from Hakit