one liner tweaks
Applied contributed Due patches.  Thanks, Bruce.