Closes #83

Warning in place, correct behavior modulo specialization.