Initial code to support #33.