Add final support for album parenting. Cleanup.