Fixed some issues with type management; made type management optional.

Signed-off-by: Atheriel <atheriel@gmail.com>