Just cleaning up the guard stuff a wee bit.