Fix various problems with drop hint calculation.

 This should clear up most of the more obvious issues with drop hints, though some less obvious issues may still remain.