Refactoring + support for multiple advice on one node.