Shorty: A few formal code fixups.