Small fixes + reentrant advice idiom.