Some stabs at handling generic types and annotation paths.

Signed-off-by: Timo Kinnunen <timo.kinnunen@gmail.com>