Code generations shapes up (temp commit).