Merge branch 'em-clean' into 'master'

EM Maxwell, but cleaner

See merge request inducer/grudge!10