Cleaned up some composition syntax.