Fix #16

  Propagating type signatures down when they're given seems to fix this bug.