src/atheme: redo things