More work on activity -> fragment conversion.