Update pragmas, a few things pulled into methods.