More minor performance improvements by replacing frequent cell method calls by macros