Moved changes to declaration style to master.