Minor refactoring in XTuple

Signed-off-by: felix-b <felixberman76@gmail.com>
Task #26: AOP support WIP