I think it's user-hostile that 'maximise' is next to 'close'. After moving my mouse so far, I need to start using fine control if I want to maximise it. I want more of the program and, if I fail, I get none of it - destructively!
Can't you double click the titlebar or use Super-Up ?
Some programs have Delete as the first item in the right click menu (and no easy undo) which is another great step for usability.