Consolidated type signatures to make code more intelligible.
Some slight code cleanup.