Use Media Object, where appropriate. Fixes #38.