Refactor LoggingAspect and MessageBuilder.