Work towards version 0.4.6.
Attempt to fix.
Progress on porting to API.