Further inventory rules iteration, see #40, #226