-trailing ; in macros and renamed password func