Moonshine improvements.

See commits for comments.