Fix / simplify rule chaining implementation