Minor dialyzer fixes

* Remove some hardcoded line numbers
* Pattern match a lager return val