added macro expansion for when forms