More behavior-skin refactoring.