A bit of cleanup of ListMacros and fixing warnings around