Thanks cas@ for suggesting to get rid of the former for being superfluous and ugly as well as to add the latter which has been missing.
