Simplify default entries sub, removing hanging $1/$2 refs.