Cleaning up disk journal checks

Mark pointed out that two execs are not needed; that setting
disk = $name in the case where there is no journal achieves our goal.