Some small progress towards fixing the implementation.