Update dependency and arch checking

Use more concise methods for both.