ENH: Made types more explicit.