Final tune-ups & clean-ups to help on auto-generation of code

Change-Id: I9bea15dc432be6ca5c566759e0cdc072baea84c2