minor cleanup (use exported facilities, not a hack)