Guard cleanup

see second commit.