Status: draft

There are several cleanups and improvements that would be nice to get into a revised .changes format: