m7-common: Make more Graphitey