cleaned up use of DataKinds for better github source parsing