Add remaining magic. Also remembered PSR-2.