Updated to latest Genry changes.