Respect recent mmaster changes. Fixes #271