Further cleanup (in honor of P. Riley)