Refactored tools in Cake.Common.