FIx undefined variable errors.

Usage data has been split out into the usage section.

Change-Id: Iaaa8fac72167cc8e869ff80defe6dbc398c8842f