Embarassingly minor cleanup