Cover more complete set of arithmetics with eager replacement

Signed-off-by: Stefan Marr <git@stefan-marr.de>