Minor API cleanup

Exploratory changes to remove singleton instance, per bug 530