Changes integrated into Rascal from Iguana.