Prevent modlog message on failed DQ / Improve conditional style

It's two commits this time (and also won't have a conflict with kota's changes).