Concision contribution.

Updates to use more direct/concise types.