Full metal commit.

-- bennet