Sort out misaligned syntax items, fix changed generic metric type, add guards for metric type