Minimized the number of store-files... well, it compiles.