2013-05-05-15.47.05: Renamed dropx -> drop various places. This was supposed to have been done before the last check-in.