[fix] apigenlib:  Tidy up.