Simplify command parsing impl