Merge "Conslidate @MainHandler and similar to @Main (and similar)."