Merge pull request #477 from alex/opaque-most-things

Make most things opaque