Fixups from previous merge (static vs non-static methods).