This is the correct answer. Be less clever. Makes life much simpler for whoever has to maintain your code (which may well be you).