Goodbye nvr.rsplit('-', 2), hello modularity