recordonly commit to fix earlier merge without -x
* small cleanup, remove redundant result assignment and unused variable (from Lagprogramming on forum)

(cherry picked from commit 8e7572faba7c97b4b0c029e394f0eea41bf880d9)