Overhauling guardian bits and pieces