Minor code merges.